Bug: 111615259 Change-Id: I25a175251a1c1240604bf79c8e12f221b4ab1374
mentioned in commit d6f3949c
mentioned in commit 94cd1037