Merge commit '999a6d00244c4b0c2163597ee783739ce7699c5b' into manual_merge_999a6d00244c am: 86a70456a6
am: 46a7204472

Change-Id: I4790952fefa3b3f3095e242f18312c2cb4ab0e74