Merge from CM 10.2

Change-Id: I0615f674afea88ca5043725cb893b486b953d62e