Merge RP1A.190528.001

Change-Id: I882385d692db8af7075d4f6f1eec6422a2375b60