Support PQWP7 parsing without NAVIC
am: 5aa8de4a0f

Change-Id: I4e1b846a928f410cbb4b516c640dfed22d1989d9