am b34b3211: Merge "Re-introduce single-shot mode, set MS Assist Mode A when...
am b34b3211: Merge "Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode." into jb-mr2-dev
* commit 'b34b3211':
Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode.