Upto 1.4 and update SU with multi user support

Change-Id: I091b3c91ff113697761a4fbd96b7776f261fbc84