074a605827
Test: locally tested on Tangor Flag: EXEMPT - bugfix Bug: 399364544 Change-Id: I788c5644f198ead206bb7512ec96eab838e51cdb