DO NOT MERGE Hide decor caption APIs am: 43d246dfa2 am: d838d5de41
am: c3326917ec  -s ours

* commit 'c3326917ec5e382f1dbde54fdf9308f1b7d21aac':

Change-Id: I17a9c189c4b829fb29bdc6d7e362d62e82a45999