Hey, why we need this?

Change-Id: I5f96089a618adc415e14d6c6b22583c6e6300801
Signed-off-by: Kevin Liu <airk908@gmail.com>
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0