am: 4c24c2a3 -s ours Change-Id: I886fd8255f8d14f24628abe8b259ced4f816079a
mentioned in commit 91e77e24