Bug: 319669529 Merged-In: I99ab5d3bef6e5aab2043400cade818b0789b8f44 Change-Id: Ieb3b8ed7ad2621ad6a52a6f048d6978a4127c781
mentioned in commit 3231cbf8