Cherry-picked from commit 8ce570b0f3 in master. DO NOT MERGE Change-Id: I6101c7ae041b4cc1237ce7a9983753dbdfa301d3
8ce570b0f3