Test: Locally ran and passed Bug: 329189635, 329188827 Change-Id: I2c4948cb47aac28d403edfc94aa3b8dfe766f6f8