6f47f5885e
* Modified to make it working with AOSP Change-Id: I921e195f512626237c5315bd4de0da63778da078
* Modified to make it working with AOSP Change-Id: I921e195f512626237c5315bd4de0da63778da078