Merge branch 'stable-3.6' * stable-3.6: Fix compilation errors against stable-3.6 Change-Id: I6b53f916bc04589d813df652ad28a4c71165d3a0