Automated merge of MTK Keystone code for 2020_03_30 am: 02567000bb

Change-Id: I2f43e50b22a90389c71e1f24a1333ae3b8d2bca8