Merge commit 'fc614476e42b461e5bee40b9ede172b6eec7b5d9' * commit 'fc614476e42b461e5bee40b9ede172b6eec7b5d9': Fix NPE in Home sample.
Merge commit 'fc614476e42b461e5bee40b9ede172b6eec7b5d9' * commit 'fc614476e42b461e5bee40b9ede172b6eec7b5d9': Fix NPE in Home sample.