am: bc960f3d Change-Id: I3452175f875cdc6e92e348633b8b9c3216f31bd7
mentioned in commit b58db794
mentioned in commit 2d0543ec