Merge 784515ad

Change-Id: I3e5b691d008e9548f43339635bafdd95bc2f56fe