DO NOT MERGE - Merge January 2020 Security Release into master
am: 6dcf78648c

Change-Id: Ib8e903ecb12b07569b73fb0161bdc808edd26920