Merge "Move and rewrite bit loading/storing methods."
am: f604975530

Change-Id: Ifbc7ad7310f2ebb77ab11cc50d28271623f814b5