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

Change-Id: I1d406b5875239d4e192ad2f3bffcfda0c018111a