Merge "Add --no-test-api-acces to am instrument." am: 188abff5b2
am: 5c8ed7f6e7

Change-Id: I6b9f9634df7925a85bd837ba0868cd96b5087757