am: fb54911b Change-Id: I225b5678f5c48743a25e864e5e6efde7dbe474f6
mentioned in commit 461773e6
mentioned in commit aafa3da3