Merge RP1A.190528.001

Change-Id: I9b02f56459006be1fc82c0c9327c852b0d35cfb4