Merge RP1A.200515.001

Change-Id: I68814961854809dc156b52dd9f7b909f02c2fca5