DO NOT MERGE - Merge January 2020 Security Release into master am: ccf87b69d5 am: 724b6f63bf

Change-Id: I9d6567a2278f8940922949603bd1d9abd81e11c0