Merge CM11.0 to sc03e

Change-Id: Ifb339f310c63dd6966399d3380ec97775281c896