Test: manual Change-Id: Ib663a9026fdf037d4ace9169ece28f94bf447079
mentioned in commit 6333427e
mentioned in commit 0871af85
mentioned in commit 5cb8036a