Bug: 168121204 Test: Manual Change-Id: I4abb6c75aa0f22416616a713733bef2802b703d1
[preview attached to BR] Bug: 166044087 Test: Manual Change-Id: I997fc1c7e2e2c500f64858df9ccea4911e05d649