updates from cm

Change-Id: I1a0dc9916b5207d796c6e8d03c35f9efb950fc23