Merge "Extra security checks in placeCall."
am: 3cb2f5e569

Change-Id: I307164aa24794cd71f5cdb7e6e1c078da9f2d376