Bug: 27865109 (cherry picked from commit 8d74de55) Change-Id: Id4f0668ea212f0fd82d32437ea251118bfce1ae2