Merge changes I64659916,Id09ce5af
am: c538043c13

Change-Id: I264a771e64a3a9956f7a2ccdf63a3f6538b785bc