[automerger skipped] Enable more options required as dependencies. am: 7341763c -s ours am: c0fac668 -s ours am: 7489395d -s ours Change-Id: I5faa5f8c0b49c972ccce39794cbcb5b5a04ec048