Merge RP1A.190528.001

Change-Id: I9d114c069f8760ee9244e4fd329fd838bd891e95