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

Change-Id: I7d5c36a4f77894037ec33fa6315f703d2c007a39