Merge changes I78839ed4,I75ac0e26 am: e4d65b681a am: 040674586b
am: c3674ab1b2

Change-Id: If833a45f3b40592b5c94cbdb51322c90855fe397