am 4bd05717: am 670ccf2c: Merge "GB Updates for init.rc and boot command line"

* commit '4bd05717e2156a0eeb9de81de3e8595b560f2627':
  GB Updates for init.rc and boot command line