Merge changes I8c58d6bd,I0a19fd87 am: 291fd678e5
am: d461fd39fb

Change-Id: I51cd639eaa6a4d0ec1d9db6c558a22ab4420a35c