Use Common Resources

Change-Id: Ib92fa9a02708e686966ebc70abcfc48295fdd636