am d5958661: (-s ours) am 0ed694f3: DO NOT MERGE - Change PLATFORM_VERSION from MNC to M

* commit 'd5958661c524f7023b8796eee28117d333f838b1':
  DO NOT MERGE - Change PLATFORM_VERSION from MNC to M