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

Change-Id: I21e375c94fba4cbcc5547b683ba08eb3c0f5dbd0