Merge "DO NOT MERGE - Merge January 2020 Security Release into master"
am: 3b79cfb72d

Change-Id: I252631c788fa1c586afe3704cdf5101a513aba7a