Merge RP1A.191031.003

Change-Id: I78438e3cc0c0a458b9313c367d1c74c79b9506d1