Merge RP1A.200417.001

Change-Id: Ib6080e8228a38815068cc88b4c2015eae793046f