am: cef97a72 -s ours Change-Id: Ib055e38af375767cc1399a0270fe03937dccbff1
mentioned in commit 041f460c