Merge RP1A.190528.001

Change-Id: Ibf6c0cd2884d2a3fe85ddf228355928d9ba21f86