UPdates from CM

Change-Id: Ie38c6204867a39c5d0bf021c5e8e643c8452d0e7