am: e94411bd -s ours Change-Id: I22426a1c36709f9772debe40374238f8ea895ecb
mentioned in commit d2fb335a