Merge changes I714163b4,I368d5ce2 am: 893c2a3fac
am: 7746a54b57

Change-Id: Ie0083b7ef8518aa7b46514bd93ae7dda6ee2bf29