Merge changes from topic "tp-master-security" am: ce68570fa6
am: 1c8960a480

Change-Id: I4bf9221d0eb1cf918a3b444e80eac1ba432de229