Merge "DO NOT MERGE - Merge January 2020 Security Release into master" am: 3b79cfb72d am: 54e69f89c9

Change-Id: I3631414dbfe50fe5145b0bf96cbbc5b8ed78c6b4