Merge RP1A.191114.001

Change-Id: Id0bb85af74918f54687cc0645aa8f79b23eee877