DO NOT MERGE - Merge January 2020 Security Release into master am: 6eb02b94a0 am: 21cc8a6150 Change-Id: I7dade3ac918e207d5cb0926770b17f2e190834b8