Merge "DO NOT MERGE - Merge January 2020 Security Release into master"
am: 12ec6e36e9

Change-Id: I209fa70bf37a25f3ba8174d2c1a5845ef593bc7d