[automerger skipped] DO NOT MERGE - Merge January 2020 Security Release into master am: ccf87b69d5 am: 724b6f63bf am: 542fc0ba3b -s ours
am skip reason: subject contains skip directive

Change-Id: Ibb0e745bd5d802a7a65066f0ef92082947dd8c51