resolved conflicts for merge of 0fcc46ac to mnc-ub-dev

Change-Id: I3adfcde78cd78398719f6ab2713a8d661029779a
(cherry picked from commit 5ac334d5fb72e3c248054802db9ca47cbeda4d24)
1 file changed