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

Change-Id: I30bf4ba5e974c9b22fe9f30861c930d25cfab7e4