Merge RP1A.191031.003

Change-Id: Ib086074370a64b29bffa73a71dcd4ccdd19155e9