Merge RP1A.191031.003

Change-Id: Ie6b08e1bc5b12191384b2ea7f03d99ecd5017f44