Merge changes I88689889,Ibfd66734
am: e2d977bffd

Change-Id: I01ca951c36aa0c0458296839810eac341b7b0b30