Merge RP1A.190528.001

Change-Id: I7dd97969b2457455978a8d9a33768b9b2dff7220