Bug: 8291716 (cherry picked from commit 3f8e302a) Change-Id: Id85d6dd05cd204143bd68d4e7eeaa8499407061a