DO NOT MERGE - Merge January 2020 Security Release into master

Bug: 147314974
Change-Id: I3e095a95bda0f4a7feaed39fb8789604d8e59cb9