Merge commit 'b68601d247ef557fd3fd7e1cf6dcbe35030d1532' into manual_merge_b68601d

Change-Id: I38ab50f3cf7a0fa4ca71a647021975fb9b3eb968