Sync to 7270

https://github.com/ZIM555/android_device_logan/commit/bcf05f70066c33bd8afae2906bd7dba62306925b