Merge changes I1e067235,I01e44473
am: 36aa63eb44

Change-Id: I52a81f40d8fc4cb633eecab8e9aa6d8b7ae84889