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

Change-Id: I5be83efaef66d9180c81955fd1df1625fe072d72