Merge RP1A.191031.003

Change-Id: Id6b737348ee0d2bb6d33a3095b91b59bdafbbdb5