Merge "DO NOT MERGE - Merge January 2020 Security Release into master" am: d48bb1d764 am: 5f24bc2edf

Change-Id: Ia32f0372918ec957fa3eceeb87694759d1531473
tree: e2a735bad1be44971b984dfb0eff426e823d690f
  1. core/
  2. services/
  3. tests/