am 8fe9840b: am cac467b3: Merge "Fix one of the potential ANR issues from...
am 8fe9840b: am cac467b3: Merge "Fix one of the potential ANR issues from AwesomePlayer" into jb-dev
* commit '8fe9840b':
Fix one of the potential ANR issues from AwesomePlayer