Merge RP1A.190528.001

Change-Id: Iaa01f41ec34bb11bcc87f6259889fb9e8900c356