Nougat IOT Release (Polk Assist)
Merge "Fix errors caught by aapt2"