am: 16fc826a -s ours Change-Id: Id10ccae7dcf20512d83860af1fec56d00b1218f1
mentioned in commit cf7dc3ef
mentioned in commit 59fa06e2