Merge changes from topic "soong_mesa3d" am: 5dd6a39f35 am: a70f590662

Change-Id: Iebff8ae9bc8322767292464f172a431dbf9418a0