am: d1d08805 -s ours Change-Id: I140ccadb48c1efe83cf99b20cadebce2d741d9d8
mentioned in commit 49bb94e3