Merge RP1A.190822.001

Change-Id: Ic080d084ef8e8f198df3446359d2c75840187a91