am: b74a1466 -s ours Change-Id: I54ffd0881fee6da6e963423c4e4b9028e541c01e
mentioned in commit 4ef7b2a8
mentioned in commit 7e30feb6