am: d1cdde2d -s ours Change-Id: I20a2b8bb528779a45fd1c8bd857e6b1e330786ff
mentioned in commit 35198873