am: 0cfff104 -s ours Change-Id: I6634c8acea7522eef288e13ba4b995eac053c493
mentioned in commit dee29615