Merge RP1A.190822.001

Change-Id: I9519214f1f0591d0b185a4705625c2dadb466759