Merge changes I511c3930,Ifc534793
am: 4791039e1e

Change-Id: If7a3e889936055f4042320a174dc38b072c060d0