am: 216f973f -s ours Change-Id: If81c6414d650b05f5601182f77bc3b4f7bef7f6f
mentioned in commit 5d621948