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

Change-Id: I796608ea56741f66b01203f6a27c9f5fceba06f3