am: 7c3dfde4 -s ours Change-Id: I217051b251383ce205ef5f23ae4d6f0f83668543
mentioned in commit d91a695e