Merge jb-ub-mail-ur10 into master

Change-Id: I37d9f0d0d2c8e72d59694c284d064070b615c60d