Bug: 232015931
Bug: 232022953
Test: confirm configs are correct
Change-Id: Id9f0b8124015f9b0b7a5a3024e5dda6bda8daca1