Merge changes I321e2193,I1da92e2b
am: 3dfe401296

Change-Id: I99216f1afac8b365e271dc67f0b3c7f4d7a2de8e