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

Change-Id: Ib3b299749233db8304f7393caa6718f32bf90028