Merge commit \'1d8b98b\' into fixMerge
am: 01b21d8be8

* commit '01b21d8be8fcd961ae7063e462f265d32c62aee2':
  Disable share when dirs selected.

Change-Id: I8335e71b05f20018c43641eebb21754aa9664ccc