Merge 79b8f0b7

Change-Id: Ideb1bf5d1d40baff73f662c3eaad200ad9dc94ac