am: 11dc7445 -s ours Change-Id: I55a3ea6b1303c8b0c654f27ab3920cb4822ac6ba
mentioned in commit 45171696