am: b60e3b52 -s ours Change-Id: I7bfdbec296083f76c7e7322bdc6361b76f1cb9ba
mentioned in commit c2939df0