Merge RP1A.191114.001

Change-Id: Ib8cec4f2967041b190378ef213f4793e3199cd01