Merge "Fixed context reference." into nyc-dev am: d76c723
am: c491501
* commit 'c491501a82d5eb9a09e5be666a397559372319b9':
Change-Id: I1ca04332a1ae87c6fd02f544557b75d91df1985e
This commit is contained in: