-> Allows us to build against M SDK issue 22822360 Change-Id: I1178eb6bafc348699c5be8c29858eb3dff093e11
Change-Id: Id91e4c046cfe7d9aa6e7de10dbf57ee727ba160e