Bug: 183425455 Test: TVTS ag/13404743 Change-Id: I47f22580484c453237756670b5197b007d43e44b (cherry picked from commit f5c29cec)