am: eb4ab689 Change-Id: If365f7e143f0ed557f8c904b4ae422650dc0ba32
mentioned in commit f59b2182
mentioned in commit 5ee1a3f9