DO NOT MERGE Hide decor caption APIs am: 43d246dfa2 am: 5d087cbdef
am: edec1897e2  -s ours

* commit 'edec1897e2f359946125bfe26465aef3bb5181e3':
  DO NOT MERGE Hide decor caption APIs

Change-Id: I0ed26682bb0db04bd5508d3941acd71e3335c5ef