Merge ff93d9299e76367d307182fb1e2fe50dd3a6c234 on remote branch

Change-Id: I45f4b434d4fa3dd9ed74d5477a19da004f5daac2