am: edbe16e3 -s ours Change-Id: I00c03b7401be76532708607eb1b3be167838fed6
mentioned in commit 572cbe00