am: 92f60511 -s ours Change-Id: Id40f2898156e375b2e752657fbe6592d77b8a6e7
mentioned in commit 9c595322