Merge "Fix shift in share sheet" into oc-mr1-dev
am: 3a31bdede5

Change-Id: I3e1b3f3acf77a9df31b3f38b942bcbc728efffeb