DO NOT MERGE - Merge January 2020 Security Release into master am: b124bd2910 am: 668fc55a8f

Change-Id: I7e107025d19a4ca9c8dd5ebd344b06acd5e811e0