[automerger skipped] DO NOT MERGE - Merge January 2020 Security Release into master am: 445bd91eb0 am: 462df522ce am: 96e9ae15b5 -s ours
am skip reason: subject contains skip directive

Change-Id: I0e7fc670035da89ebc3fa710afe535e314e27ec3