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