am: aaf50d32 Change-Id: I3bbd52f8b334226bad47ed4e0412e1335fdfa89a
mentioned in commit 7e1d3478
mentioned in commit 7bbc6c21