Merge changes I7a3c181a,I72c60ec8 am: 6aa1b01316 am: 03784e1aa5 am: de3e798cc8
am: 4fa5d244f2

Change-Id: Ie10855f857244f65416e860dae05e74500346152