Merge commit 'b7860bea3bcbd5217f42f2fa5ead4c498600d517' * commit 'b7860bea3bcbd5217f42f2fa5ead4c498600d517': Various cleanup around resources and nine-patches.
Merge commit 'b7860bea3bcbd5217f42f2fa5ead4c498600d517' * commit 'b7860bea3bcbd5217f42f2fa5ead4c498600d517': Various cleanup around resources and nine-patches.