Bug: 30737845 Change-Id: Id092086862bc527fccc5e9f34c8a3ab16167ae92 (cherry picked from commit 737d9fb1)