Merge conflict - fixes title access

Change-Id: Ia1566bb5acda829b23584e5f1e65e24f9433ef7c