Merge changes from topic 'mesa-rebase' am: 559b138f63
am: 60573e6777

Change-Id: I9accc155484a3f20a4c65fa14727d44fbcedf902