Updated from global requirements

Change-Id: I07afee130b7e1a362597784e8e31dc35e6f74674
fix typo in docstring

Change-Id: Id89ddf8110ed63596f23fcabb2996fd0c0afe87f
Closes-Bug: #1359002
Merge "Updated from global requirements"
Merge "fix typo in docstring"