[automerger skipped] Do not set a sub as default data sub unless it's active....
[automerger skipped] Do not set a sub as default data sub unless it's active. am: 002f9955 am: abf4b20c -s ours
am skip reason: Change-Id I7ed35dc019c8bda27efba34ede549df2eec62e3c with SHA-1 4ec1828a is in history
Change-Id: Ib979d754ec718b162c9aed38c5780207993b9c6b