Merge branch 'jellybean-legacy'
Add volume steps for better precision

Change-Id: I0bf013ab3fa72457050093abcc755d45c5da9731
Merge branch 'exp'