Merge changes I8d333ea5,Ie4efc8bb
am: 9c9b9364ad

Change-Id: I66e3fda05d4bb2d18a55da9a15cc17d36b7e68a7