DO NOT MERGE - Merge January 2020 Security Release into master am: 055da6677a am: 01e0d1324c

Change-Id: I0bc594fb9fbfec1e218b97f4904d60fbd7b19ab5