Merge "Merge "Not specify return val of View#onSaveInstanceState" into oc-dev am: 1454afce82 am: 89d98d34cb"