[automerger skipped] [DO NOT MERGE] Handle config override via settings correctly am: dc0f443cb6 am: 7dab64285f
am: 68531d2f5f -s ours
am skip reason: subject contains skip directive
Change-Id: Iab9cfac91ed4c567e1f2fd41d9c3180bf03966f8
This commit is contained in: