am: 529b5485 Change-Id: Ifb6fabf15f1e74fecfafe1f7854553083c544375
mentioned in commit 79171ff1
mentioned in commit 4579a042