Bug: 27426743 (cherry-picked from commit a871ab1687) Change-Id: I4c77de05c99b811f60f2421d1f41e62c1404a4a4
a871ab1687