Merge "DO NOT MERGE - Merge January 2020 Security Release into master" am: 16ffdb8802 am: f2f6c5e39d

Change-Id: Ib1b2d4feae0e629950a1c1ba82262380dcc9a558