am: 1771c085 -s ours Change-Id: Ie9260a921ebb03db4562745f0d92e7c54d3a274c
mentioned in commit 523bea67