Merge commit 'a0fd1d742d8edaf6c7e79bdd16a9b0c44fda4503' * commit 'a0fd1d742d8edaf6c7e79bdd16a9b0c44fda4503': Fix NPE in RelativeLayout.
Merge commit 'a0fd1d742d8edaf6c7e79bdd16a9b0c44fda4503' * commit 'a0fd1d742d8edaf6c7e79bdd16a9b0c44fda4503': Fix NPE in RelativeLayout.