Content and style changes

Change-Id: I682b034a8ef2495d112cafaff9544998c084b5ef