Merge changes Ic377b678,I9ee0f97e am: 529c9d0a4b am: 88e93da781

Change-Id: I5ce0d022b642811d52f9196f4884168a18915cc4