resolved conflicts for merge of 790f9183 to klp-ub-dev

Change-Id: I11c97db0ef83f59d629fb9406bb0e240714e5f89