am: 6fab0bf2 -s ours Change-Id: I9a64291969c69150a1f2aa8ba48b826b61b0c83e
mentioned in commit e4832683