Merge RP1A.191031.003

Change-Id: Ib8a6cb028979336fb95bd337def93908b94cd709