[automerger skipped] DO NOT MERGE - Merge January 2020 Security Release into master am: 055da6677a am: 01e0d1324c am: e6f539f4f9 -s ours
am skip reason: subject contains skip directive

Change-Id: I6d4b091670291b9557d3cdd07c43317772b622c3