am: fd960efa Change-Id: Ia4cc787d21e292c15337fa5b9fff8434fe9dad33
mentioned in commit 7411dad8
mentioned in commit 16d221ff