Merge RP1A.191031.003

Change-Id: Ib4d6d97cf5f2682ab0aa1d5c023b5bd6df8cdd86