am: 2a96c802 Change-Id: Ifd9e13d150cf3739583f25ef35d802296d966f02
mentioned in commit e1b7b8c6
mentioned in commit f1461879