DO NOT MERGE - Merge January 2020 Security Release into master

Bug: 147314974
Change-Id: Ia77f51c0996b4840fcb49376f35ea17f0b1fdf48