Merge RP1A.190528.001

Change-Id: Id114557b7cb12bb25c649d73d58b7301d364ede3