DO NOT MERGE - Merge January 2020 Security Release into master

Bug: 147314974
Change-Id: Ib01393cc7cd5fe54761e52b14763d35f2c4f90db