am: f99a45a5 Change-Id: If5475cc24f211df2e1f6c001616294f7d4e07afa
mentioned in commit 45c9101a
mentioned in commit 747603d7