Merge "DO NOT MERGE - Merge January 2020 Security Release into master"
am: 45fa8ce95e

Change-Id: I4d10705027866ea946f5529166dd6f67aec9e332