Merge commit '999a6d00244c4b0c2163597ee783739ce7699c5b' into manual_merge_999a6d00244c

Change-Id: Ic55532c0d8962288346d2c9b067794d7f5c157f3