(cherry picked from commit c01a6646) Bug: 27505766 Change-Id: I077465e3d308f4331e7a861902e05865f9d99835