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

Change-Id: I3ce02a97c280bd4cf6e975da0d402b20deb6432e