am: 473f1e05 -s ours Change-Id: Id829f21ad612f9220989b61ea787b82bdd307b32
mentioned in commit a5111753
mentioned in commit 3ade6652