am: ff44509b Change-Id: I0fff9320bc6cecf3666def2b00eaffb4ea063365
mentioned in commit c316c19a
mentioned in commit 64355cf3