Merge RP1A.190528.001

Change-Id: I3cdefd4bd28b55fd3774564fb210aed4aeb4ef35