Merge changes I3de30a30,I17288da2 am: bca6ab74af
am: e39a2e13c7

Change-Id: Id1387c65ce861b097fd70a142d572f0775844fac