Merge changes I0ef88864,I7b892a22
am: ed1fa850cf

Change-Id: Ibecadf0d72b327b1e381de92078472980b39ec84