Support PQWP7 parsing without NAVIC am: 5aa8de4a0f
am: 81467e9585

Change-Id: I51a8b842cd2780de4fe9c6a4bbaab2417e3b554d