Merge commit 'refs/changes/47/2394847/4' of sso://googleplex-android/platform/packages/apps/Launcher3 into am-5eee1265-440d-4109-93c9-46ee7ae611fc

Change-Id: I2cedaed575c90aae3684769ce6621fe68b9f06b3