Merge "GB Updates for init.rc and boot command line"