Some stuff

Change-Id: I9a5511ed4bd14fa220540eb76a88051795513c78
Merge branch 'lp5.0' of https://github.com/Validus-Shamu/device_asus_grouper into lp5.0