am: 12b03afe -s ours Change-Id: Icd71a570af08fea085b97ae50093f4d171372d01
mentioned in commit 7bac22b6