Squashed reconcile w/ staging/cm-12.0

Change-Id: I53dc6cf407032ac637fc58d13f5bcfa1e653f0ae