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

Change-Id: Ida8504286e48568fa854b415379cc6ce1f094cae