Merge changes I4ae3eac3,Ibeddd7a5
am: 03c89e3907

Change-Id: I74a99ca8a6e895e6fed11adee62eb635b3a3d0bf