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

Change-Id: I7437a87b751394514d0dbe20d6afb947a9b23d83