am: ec60f563 -s ours Change-Id: I8a277b812b387c596c88d9a634ecd31c39a3dd06
mentioned in commit 6718fb65