p970: more updates

Change-Id: I6dd26ba909df59fa5a928efae91b0edb801dec78