Merge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev am: 5a2554a
am: 287dfb6

* commit '287dfb665a04822513d4c1522abaa04c58c60c76':

Change-Id: I237aee62a9482fa86260bb4c8d1cac098d880f28