Merge "VINTF CM: changes from 4 into current." into qt-dev-plus-aosp
am: 40a81306a4

Change-Id: I97e83533b380fc4be97e5b46972bba135e562cd9