DO NOT MERGE - Merge ab/7272582

Bug: 190855093
Change-Id: Id5c8ec8946d7bcb311a9acd94eebf1a08b993fd4