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

Change-Id: I74e9ca15db12c11b26a0923fbe2af09de0b6919b