Merge "Remove non-safe mode boot vibration." into oc-dr1-dev
am: 149ff697ff

Change-Id: I8339730c21619c4249826a5b855657c01757147c