BUG:67772237 Change-Id: Ie99c9a25c1bf3936cf0d3ac83962933f01815e28
mentioned in commit e3acec88
mentioned in commit 0a348040
mentioned in commit 23c8a128