Merge changes I4d351f56,Ib9e91157 am: 7669ea5a44
am: 68f136b407

Change-Id: Ie85a7e4c5a1c0f775ba766dfedc858183fc90175