Merge changes I3de30a30,I17288da2
am: bca6ab74af

Change-Id: Id6613054200faeb9216aee0e7daa1bc97259b612