Merge "Remove strong pointer in contructor to "this""
am: 62ab659b28

Change-Id: I95a270e5abbe89fcd1ece8de15ee8beef135f670