am: 94285e06 -s ours Change-Id: Iddf32c9b5dd2db0031beea92b57b0beba813dc0c
mentioned in commit e47279f7