DO NOT MERGE - Merge January 2020 Security Release into master

Bug: 147314974
Change-Id: Icd108c52e3d2b0cce537fc841adba7cf591f5834