am: c879fc72 -s ours Change-Id: If105dbfd4f22e8c8d1e37af3aac0285ea69c6474
mentioned in commit faef9a5e
mentioned in commit ee3decdf