Closes-Bug: #2086171 Change-Id: I4001ddad198dcf40f71e9196e126cc78a19d1437
mentioned in commit a0794c00