Merge changes from topic "bugfix_content_path" am: aa642187cd am: f8ad474935
am: 8fe3754f1a

Change-Id: I1718c1c34860b23d7dbe22bb6350825483e41fd6