Bug: 30292533 Change-Id: Ifd9ca24804d96d0e50dd0f94a028233cc2cbca4e (cherry picked from commit 4dd89b6d)