Merge RP1A.190923.001

Change-Id: I28c73443980631f5f40625e2bd4a875ef77a97ac