Bug: 15089664 Change-Id: Ic967adde89f30261c75fca67c09d14d35bd1cdb3 (cherry picked from commit 1236710b)