Merge changes I6437dc95,I77261381 am: d9f506fd47
am: 1a04c987e1

Change-Id: Ie2b1a07adc7dda6a1bbdd9fda09d9956a02ba0d0