Merge 2 changes from master.

Change-Id: I20384bb557ec24bf55cdad0e633f4a814791e5e7
2 files changed
tree: aec0ab31fd2c6fe57af4e0f16ec56a386daf8356
  1. common/