User can now modify his/her upcoming AWS.
User can now modify his/her upcoming AWS.


Former-commit-id: 31ce40e691149ea2d3035a293be1dd5383aa108d
Former-commit-id: 1ce5cfcabff9858be4b9704e80e8f88bc81266ca
dilawar/ncbs-minion,dilawar/ncbs-hippo,dilawar/ncbs-minion,dilawar/ncbs-hippo,dilawar/ncbs-minion,dilawar/ncbs-hippo,dilawar/ncbs-minion,dilawar/ncbs-hippo,dilawar/ncbs-hippo,dilawar/ncbs-minion