Merge "Add some logging for buggy calls to AM" into oc-dev
am: 54a3ce2d0e

Change-Id: I9b04311e6698dea7c8e19d585270e4b1ed52d45c