am: 471f1347 Change-Id: I8cd55ac2e954c698388b27035e518008ac959f64
mentioned in commit c5af1b98
mentioned in commit 3a9341c0