Merge commit 'c3563eb9' into honeycomb-plus-aosp

Change-Id: I63ff88ae3597ea8722a59d16e66f5ea65ffa3b9e