Bug: 30436707 Change-Id: I99a2b103d0643158da00ee0b5547b52bf6ebc040 (cherry picked from commit f27ab3c1)