Merge \\"Hide more shortcut APIs\\" into nyc-mr1-dev am: 07e234c9d7
am: 639a862315

Change-Id: I215b00bae0bb6f9f6c44c23a713f69988f9ec9df