am: e2096432 -s ours Change-Id: I02ed833ac3548f714b6451524ebd3b992085ff0c
mentioned in commit 0bc02ffb