Merge commit '1afe62d1781e2fcf117a386a7a1162cf856c23dd' into manual_merge_1afe62d1781e2fcf117a386a7a1162cf856c23dd

Test: presubmit

Change-Id: Iaf63a24193cd1bb0c87f1d00182cc995b5fbeb60