Merge RP1A.190528.001

Change-Id: I11f1b33cce00d45755487e41e7050c2147cf81ef