am: 03b65a9f -s ours Change-Id: I3262f7cd5fbc419b8105b91c946f82c4782943b2
mentioned in commit 832ae672