Bug: 28087967 (cherry picked from commit 9c6eef8c) Change-Id: Id0352c19c2da353320cfcb7462b10436356a2052