DO NOT MERGE - Merge January 2020 Security Release into master

Bug: 147314974
Change-Id: Iae684da890fa24acf78dbd2d48cf5a9feb0506df