Bug: 309721598 Test: make Change-Id: Ia6ef29d3ba5b5a5348dc35caef87f660d7193bc2
based on 84d60a2e19d4ad09086067994d2f683ff86f6231 Bug: 263919239 Change-Id: I7be43786325116baddd35e182f87ad15fbe1a6ce