Merge RP1A.200426.001

Change-Id: If8cf9f3b116272c762303ec0c89bdfb7a538432d