build: merge with master

Change-Id: I8ea836ce92c1c96f1e2bdf45e704d36ec9dbc401
7 files changed