Merge "Make SCP broadcast protected" am: b800dcb733

Change-Id: I262b7121d91a6b29ef8cda03697d89959fd62043