am: d602c873 -s ours Change-Id: I7e6cfaf8592fdf3a1179b7b93a0d57f44cdc8a26
mentioned in commit afca77cc