Merge changes I66d4fc71,I686dce91,I31325c76 am: 497cb085c7
am: 2993cc1e07

Change-Id: I65a08bed13c477193c38ac6770b5a92cef3ccca9