am: a96b39fe Change-Id: I6fb81a24f602fca378d7ad8d5c660ace33dd4e02
mentioned in commit f6907397
mentioned in commit 5973926b