Merge "DO NOT MERGE - Merge January 2020 Security Release into master" am: 45fa8ce9 am: a52790f0 Change-Id: Ia32f0372918ec957fa3eceeb87694759d1531473