BUG=30897947 Change-Id: I919d7fa9c3bf196371e506d23e393a9d609a5b4b (cherry picked from commit 4bfb391c)