Sync with master branch

Change-Id: I55d81f25f80147cdfcbe9681ffc09a1022b3c28d
14 files changed