Merge changes I1cc5d702,I32ab9854 am: 420f7f8df4 am: c4ba6b738f
am: 13415d9138

Change-Id: If1f0b46e3134fc8a36553ad98f8e03b3e3488f81