Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev am: 47aa3f61ac am: 88a2a7be72
am: 80cbce0094 -s ours
* commit '80cbce0094d6e55d7e6be1568ff1d9402ab0a823':
Change-Id: I44f78fcd7de589341614f7da152f266fe28c19be
This commit is contained in: