Merge changes I401c064c,I16431a4d
am: 84464cae37

Change-Id: I4f70d8d32dade71f5197bf2f5d9ecee0feee744e