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

Change-Id: I06c57b367398eda4ea502f762d261f70d03eacdf