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