Merge c3c57dcef3abbb8d917febd501b03c16d6dfa12a on remote branch

Change-Id: I75e50619fe569d7e65623c1eccbbc0e0549852bd