Bug: 161180005 Change-Id: Ida59b87b2fb5905d98b0090630a6ce32fc9c36c8 (cherry picked from commit 93188d61da)
93188d61da