am: 1b5c0207 -s ours Change-Id: I6a7715041e6c113d464fd2f9abebbd5ed3cea527
mentioned in commit af94c50f