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

Change-Id: I58734ad16e7b0661dedf8950b3520d9d8cc6cf22