am: d6055b89 -s ours Change-Id: Ic890106c18378584081b9209ae261dab6726438c
mentioned in commit 74189689