Merge "Fix error color states and alphas and sizes of lock screen icons" into oc-dr1-dev
am: 905fcf0787

Change-Id: I47c8b0d13a1bc511088d1a895017522831f42b8d