am: 21afeb4d -s ours Change-Id: I27943bb25f1b751ab45e47392052df03b8ac9817
mentioned in commit 82002697