Merge changes I1f50e09d,I8b2bb87a
am: 1051fa2d74

Change-Id: I9365ba4b178dbcae45fce5e26c4dca6658aabd98