Merge changes I85e6c989,Ie4ecc502,I1f8cfbb7 am: 0e95c2108f

Change-Id: I5d7e9296896bac44693833c1846be99d79d2935d