am: 3a1b861e -s ours Change-Id: I5318e07859f4ae3768a1ccec7045a1c9c2dd3273
mentioned in commit 21fa6d60