Squashed commit of my local branch

Change-Id: I52eefbc41f3af2bc07b779ab40366d87c64c897d