Merge RP1A.190528.001

Change-Id: Iee6f817cf5e0e4b39829e153c473f55c5b5f4a19