Merge RP1A.190528.001

Change-Id: I2dde403b869f748862a260cfbf34d97927c9905f