Merge device/htc/m8 upstream

Change-Id: I7c1810531a2123691403bd3e7987761ce149690e