Merge changes from topic "import-lib-access" am: f7c40da307 am: 54797192c1 am: e90ae21214

Change-Id: I79aa31794c50d6a26c2da8e77356b196b17c4cc3