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

Change-Id: Iac9ceb105641f9fe549500db9b52501617b58f54