Merge "Merge "Hide ephemeral API" into nyc-dev am: 68c2919f70 am: 75a364eabf" into nyc-mr1-dev-plus-aosp
am: 91dc1b8f03

* commit '91dc1b8f03dbed73ef44e451d4c17585637e3e0e':

Change-Id: Ic42fddf235a0999f9e972beaa268e8313cb229a0