Optimus G updates

Change-Id: I3110c3c2dcf7c1e18a876f58d902d9647c6b0a60