Merge "Hide mandatory backup's API." into pi-dev am: a9431996c3
am: 99aac99341

Change-Id: I53df6d238cae1e4cf529bb6bbc6fb60c5040fedf