Merge changes from topic "offlinesdk-docs" am: 003f49cf0c
am: 7e1e76a6dc

Change-Id: I43a6d15e11e8ff4d79ceea3d6530c2899ec849ed