[automerger skipped] Merge "Hide API" am: 0a7c66bcd8 am: cc9f55e09e -s ours
am skip reason: Change-Id Ie4c46de336097fb7231291f15048329aea0b639c with SHA-1 f0df0ba2ba is in history
Change-Id: Ia46d215763e9be8be05f4836bfee5bc7534b87a6
This commit is contained in: