Merge "Make embedded hardware layers work. Bug #3369474" into honeycomb