Merge branch 'bali'

Change-Id: Icf18b4981afb12ef255fca431d4ba45860dd22c9