Merge changes I6643c9ee,Ibd412b26
am: b5708a93b1

Change-Id: I4d1b1fa65bbe5cda5fe9a56c8e7af40ea3ca8701