am: fe5d4283 -s ours Change-Id: I6383d20be290683905bcf5d3d3633cd4d408ff22
mentioned in commit eebd12cc
mentioned in commit ed10fd5b