Merge "Merge "For some reason template system was getting caught up with...

Merge "Merge "For some reason template system was getting caught up with different template xml files in some projects. Reverted them, then reset them back to changes and refresh works properly now. Trevor pointed out sometimes system gets confused when template file is differet. :/ am: d9083dac am: 474a8bab" into oc-dr1-dev-plus-aosp am: fdaa502f" into oc-mr1-dev-plus-aosp
am: f3647e5d

Change-Id: I34864473c0e53a55b2ea14200a315dc7a39b2e47