Merge \"Prevent brightness changes before boot complete.\" into nyc-mr1-dev
am: fbd93027e4

Change-Id: I6ef545549df6db01cf15f0f3ea5add4cda094889