Merge from master

Change-Id: I20c8bb451376e78b306ac231cf3d6a239a72267e
15 files changed