am: e05c4443 -s ours Change-Id: I0e401f157e8efcda0b50f52c41d3d66dc95443b7
mentioned in commit ed92f6f2