Merge res-common resources with exising file in res
am: 13a9c33a5f

Change-Id: I3b1532983fe25d97720eb4c35aa7d2e9323a70e0