resolved conflicts for merge of 9cbf8177 to master
resolved conflicts for merge of 9cbf8177 to master

Change-Id: I01f51590820e5b43889dabc2696578dd50cdeca7

maruos/android_device_lge_hammerhead,maruos/android_device_lge_hammerhead,maruos/android_device_lge_hammerhead,maruos/android_device_lge_hammerhead