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

Change-Id: Ie804f87f8a4281e654f6c6193ff096e41814585f