Merge changes I1c0be5f8,Id837c19a am: a39685735c

Change-Id: I8f178527524881049f16eaf4017332badf48093f