am: c5726379 -s ours Change-Id: I7eea7280eef366d747740202f49298edf7c8c104
mentioned in commit 549d000c