Merge changes I937ac6ab,Ib94f78f7
am: fcb69b8543

Change-Id: I104e767e641ae51c26153827cb8a9c348a6a1f8c