Merge commit 'c4381df50a0f226a60a63c786f57ed74e9c4fc6b' into manual_merge_c4381df50a0f226a60a63c786f57ed74e9c4fc6b

Test: presubmit
Change-Id: I031fbde20b8e66e7ef1255a1ff3a3c15644070f9