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

Change-Id: I0f4beeb2a44ba15ba2b35a2cc40dce47c81d0a4e