bug: 30963384 (cherry picked from commit 63203a01) Change-Id: Ifa4b9a645f8edcf51e3f025316106e5b65a4790d (cherry picked from commit a60342b7)