Merge changes I56d4f852,I8c81dc1f am: ce79190156
am: 8194a7ec21

Change-Id: Ic42ddbb0230f3e478e6411b21ff61f41f32f8947