Merge RP1A.190923.001

Change-Id: Ica1ec121f773db84b2544076be4141ba2638aca3