Merge RP1A.190923.001

Change-Id: Ie41507ccca9df23e0761e14d18430f5946db4812