Merge cm-11.0 to aosp

Change-Id: I1031c325b162ecfc4ecbe7ca54626effb2dc8a55