Bug: 20640451 (cherry picked from commit ade58e14) Change-Id: I8ac7fea3d9d2a434ee79fb917e68a4dc96e5482f