Integrating ToT changes from WIN Bokchoy branch. These changes have been added as part of Bokchoy FRs implementation Change-Id: I0637e3ffcbc49ce05aac20baa2da2940dfa6d77c CRs-Fixed:1031703