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

Change-Id: I8492f3312caf7de0a5a7f051eec2688ba7f103e4