Merge RP1A.190528.001

Change-Id: I69bf5b9bca0e9bd0a9fb762ac539902aabcc048c