Merge changes I1c1445ba,Ic0c8b163
am: 309d6dde31

Change-Id: I692405863f30006ff23c339efc0469d4ac71fd48