Merge "DO NOT MERGE Set module versions to 299900000" am: 54cfc0fe4b
am: edb31015d0

Change-Id: I87a183e1e9d466e667f089fb900a82d6775fa6f4