Upstream: Mobile skin code to Minerva skin code

Change-Id: I27a8d3d69df83c297bb08b38ed177105c9a1d8de
Merge "Upstream: Mobile skin code to Minerva skin code"