Merge "Parallax: API factorying and add direct mapping" into nyc-support-25.2-dev am: c298c564b7
am: 2fa65238c2

Change-Id: If450472c61678cfbf7013d3084aa971a58446878