am: f6148e24 -s ours Change-Id: If552c833def48c291c70b729a2ca92ef1ca3e570
mentioned in commit c94a5884