More updates

Change-Id: I82bdbd81e6c732b32841c57b8cede51dfa3f5a48