Merge "Merge "Update guts to match latest specs" into qt-dev am: 28108966...
Merge "Merge "Update guts to match latest specs" into qt-dev am: 28108966 am: 38f5c857" into qt-r1-dev-plus-aosp
am: e33d5f02
Change-Id: I138d5327eb3bd8b0c773702020cd7663da356eef