Merge "Framework changes for 464xlat." into jb-mr2-dev am: 82217ba580

Original change: undetermined

Change-Id: Ia9f0ace07f42fa25b11be01270514ef340b59a07