Bug: 153878498 Test: Test app from the indicated bug Change-Id: Ied48bdfa4e168dad7d829dbe21cc441dfde868ae (cherry picked from commit 0617b71c)