Merge RP1A.190528.001

Change-Id: I0d13cd8357defc8178f2dc3a4935c59f36128746