Merge RP1A.200526.001

Change-Id: I8e5fa9ce9c6bceafc97a078ee22c97ca3577becf