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

Change-Id: I716e45e68d74968551dfdb48d57b5e4a39ead09e