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

Change-Id: I855b2b95de88979d483b5c0bfa33c8c3b5915728