Merge commit '11778f1ecd8c9435889ba13bfce0db5520af68a3' of sso://googleplex-android/platform/external/dynamic_depth into HEAD
Change-Id: I6cb0e6cdc90de1cb085cc8e7f026bffd2df16680