am: db9c7878 Change-Id: Id087f4069e7606cc453280389d66d9cbe1bd2163
mentioned in commit e5b90c86
mentioned in commit dcad1bb6