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

Change-Id: Ida43ed5c955b2a7155c6136b64b00ffa15f7a824