am: 51dde35a Change-Id: I7bf269fb609a5a6adb5b29148b982994afd3c171
mentioned in commit 7f075e33
mentioned in commit ecf16dea