Merge RP1A.190528.001

Change-Id: I38639861adeec75a5b4f840a26216876829355fb