Bug: 28108983 Change-Id: I1ab9c46834ec106de1da36dc65309161df850312
mentioned in commit 6f2e6974
mentioned in commit d22eafef