am 8dbb4328: Merge "Fix drawer selection to match Material spec." into mnc-dev

* commit '8dbb43289ccc6bf85399eb3737be0dd5f01de923':
  Fix drawer selection to match Material spec.