Merge RP1A.191031.003

Change-Id: Id10a229d159a3036c69f5a0044a16296e55deef9