am: e64ee79e -s ours Change-Id: I812c82732fda978e1f36ceec4a705471fbe335f8
mentioned in commit cc91184a