[automerger skipped] DO NOT MERGE Set module versions to 299900000 Dev branch modules need to have a super high version code so that they can be sideloaded on any device running any version of modules. am: 66c527f3c7 am: a1f724d126 -s ours
am: 3cc8843321 -s ours
am skip reason: subject contains skip directive

Change-Id: I43bfdb935bb3c101fa775130f623978d7bec5dca