Merge "Get rid of custom negaitve save button label am: dc6cccb905" into oc-dev-plus-aosp
am: c8dda2ad63

Change-Id: Idb3668a644fa3a528811f59121fb0e5e252a82db