updates to stockmode

Change-Id: Ic36738bdd39ad4f61a8d1bd3015452a04e9422c4
Merge "updates to stockmode" into kk44