Merge RP1A.191031.003

Change-Id: I5966747e590c140b1cb68910858962cb83a2131d