Merge changes for XPerience-AOSP

Change-Id: I534ac9d1d460434a3c94b2d8eee5dbc00a67b8ce