(cherry picked from commit 309eb7b1) Bug: 27600652 Change-Id: I32466623379928cdaad839303e6ea3a39d673cd4