DO NOT MERGE Hide decor caption APIs am: 43d246dfa2
am: d838d5de41

* commit 'd838d5de410faee94862b24a72a7cc80c6829e43':

Change-Id: I78e76ce56b69ea8b1bb4c4f5f969a7bf859e8533