misc: Updates from OSRC.

Change-Id: I0e1fd5b7071a011e05eff8a5b03896c3fedd0092