am: 4110660d -s ours Change-Id: I029262474fdab29016eaf0dc009047cc5c899693
mentioned in commit 11832a93
mentioned in commit ecaabf87