Merge commit '999a6d00' into manual_merge_999a6d00244c am: 86a70456 am: 46a72044 Change-Id: I4790952fefa3b3f3095e242f18312c2cb4ab0e74