DO NOT MERGE - Merge January 2020 Security Release into master

Bug: 147314974
Change-Id: I9a6bbbd9e7d339fc62dd27cbd0ea050ab38348b7