[automerger skipped] Merge "Make SCP broadcast protected" am: b800dcb733 am: dbcdd0789b -s ours am: 30a92fe817 -s ours am: 8c2d7d08ec -s ours

am skip reason: Change-Id I94feaecda633507604321ed23f39026a7e77b3df with SHA-1 f60f36904d is in history

Change-Id: I60805307a796710ac9f4495ca24a62b287b542de