Test: N/A Bug: 131773907 Change-Id: I5e30c75eed3b87c96196ebbd3e1aae92e0bb5f7c
mentioned in commit e27cad82