Merge changes I3d2b23b5,I9463e2c9 am: 2e72cdf3c1
am: d99b2ff034

Change-Id: Ib702c0c2acb55cfa1c4324019a744ff5a75626a9