Merge c6d0b08361e80436353e1ee79ae9c09c60a50eb1 on remote branch

Change-Id: Ifb317d5eba52bd458c74e583d70a7f8dd377317c