Merge "Add new colums for skip464xlat" am: bf33e74ee1
am: d117ce3bee

Change-Id: I98b0d1f6ed32820d1cbf06650a2fdaf698564b26