Merge changes I3e6e5a22,I6eb3f066 am: 75836d5e7f
am: 5966ae2c6b

Change-Id: Ie9ac57d24b85d9f0e38dd75f380def393bd2c10f