am: 1531615a Change-Id: I3707e5cd4540369a8fb7b98f26a23260712ff578
mentioned in commit 314a8f49
mentioned in commit e3169bcf